fix bug #5241

diff --git a/gtk/xdgmime/ChangeLog b/gtk/xdgmime/ChangeLog
index eb37db85e66d39e3fb8f07d886f0217e3bd10fa1..f316e4b904c8e48366a3b2e061222139249e8666 100644 (file)
--- a/gtk/xdgmime/ChangeLog
+++ b/gtk/xdgmime/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-19  Matthias Clasen  <mclasen@redhat.com>
+
+       * xdgmimeglob.c (_xdg_glob_hash_node_lookup_file_name):
+       Don't return NULL as a mimetype, ever, patch
+       by Yevgen Muntyan, bugs.freedesktop.org #5241
+
 2006-07-02  Matthias Clasen  <mclasen@redhat.com>
        
        * === Released 2.10.0 ===

diff --git a/gtk/xdgmime/xdgmimeglob.c b/gtk/xdgmime/xdgmimeglob.c
index 72c19c3521152a5d0258749de37b2936e6d07fef..95d9587ff463ede22e356dfdbb4477761d1bcdcb 100644 (file)
--- a/gtk/xdgmime/xdgmimeglob.c
+++ b/gtk/xdgmime/xdgmimeglob.c
@@ -308,11 +308,13 @@ _xdg_glob_hash_node_lookup_file_name (XdgGlobHashNode *glob_hash_node,
          if (*file_name == '\000')
            {
              n = 0;
-             mime_types[n++] = node->mime_type;
+              if (node->mime_type)
+               mime_types[n++] = node->mime_type;
              node = node->child;
              while (n < n_mime_types && node && node->character == 0)
                {
-                 mime_types[n++] = node->mime_type;
+                  if (node->mime_type)
+                   mime_types[n++] = node->mime_type;
                  node = node->next;
                }
            }